From: Arnaud Delcasse Date: Tue, 4 Sep 2012 19:21:43 +0000 (+0200) Subject: Fix error during merge X-Git-Url: http://git.cyclocoop.org/%28%5B%5E/%24wgScriptPath/%40%20%27info_articles_miens%27%20=%3E%20%27My%20articles%27%2C%20%27info_articles_tous%27%20=%3E%20%27All%20the%20articles%27%2C%20%27info_articles_trouves%27%20=%3E%20%27Articles%20found%27%2C-%27info_articles_trouves_dans_texte%27%20=%3E%20%27Articles%20found%20%28in%20the%20text%29%27%2C%20%27info_attente_validation%27%20=%3E%20%27Your%20articles%20awaiting%20validation%27%2C%20%27info_aucun_article%27%20=%3E%20%27No%20articles%27%2C-%27info_aucun_article_syndique%27%20=%3E%20%27No%20syndicated%20articles%27%2C%20%27info_aucun_auteur%27%20=%3E%20%27No%20authors%27%2C%20%27info_aucun_message%27%20=%3E%20%27No%20messages%27%2C%20%27info_aucun_rubrique%27%20=%3E%20%27No%20sections%27%2C-%27info_aucun_site%27%20=%3E%20%27No%20linked%20sites%27%2C-%27info_aucun_visiteur%27%20=%3E%20%27No%20visitors%27%2C%20%27info_aujourdhui%27%20=%3E%20%27today:%27%2C-%27info_auteur_message%27%20=%3E%20%27MESSAGE%20FROM:%27%2C%20%27info_auteurs%27%20=%3E%20%27Authors%27%2C%20%27info_auteurs_par_tri%27%20=%3E%20%27Authors%40partri%40%27%2C%20%27info_auteurs_trouves%27%20=%3E%20%27Authors%20found%27%2C%40%40%20-298%2C8%20%20254%2C6%20%40%40%20Do%20not%20submit%20this%20import%20request.%3Cp%3EFor%20more%20information%2C%20please%20see%20%3Ca%20href=?a=commitdiff_plain;h=60cbdb2b48d0038f54294546a013aeffc94ddc90;p=cavote.git Fix error during merge --- diff --git a/main.py b/main.py index 3ac3664..fc18674 100755 --- a/main.py +++ b/main.py @@ -17,7 +17,8 @@ import string from settings import * -app = Flask(__name__) app.config.from_object(__name__) +app = Flask(__name__) +app.config.from_object(__name__) oid = OpenID(app)